From: kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Date: Thu, 4 May 2006 10:24:19 +0000 (+0100)
Subject: Change Mini-OS so that it uses stddef.h to define size_t and
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16108^2~22^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=f2882b87263ff202cd1b1851d269ba76c5137adb;p=xen.git

Change Mini-OS so that it uses stddef.h to define size_t and
NULL. This problem fixes errors that occur when linking Mini-OS with
ANSI standard code that uses stddef.h.
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/extras/mini-os/include/lib.h b/extras/mini-os/include/lib.h
index 7631349faf..473a059705 100644
--- a/extras/mini-os/include/lib.h
+++ b/extras/mini-os/include/lib.h
@@ -56,6 +56,7 @@
 #define _LIB_H_
 
 #include <stdarg.h>
+#include <stddef.h>
 #include <console.h>
 
 /* printing */
diff --git a/extras/mini-os/include/os.h b/extras/mini-os/include/os.h
index 8758c5dd23..883d5f6b1d 100644
--- a/extras/mini-os/include/os.h
+++ b/extras/mini-os/include/os.h
@@ -7,9 +7,6 @@
 #ifndef _OS_H_
 #define _OS_H_
 
-#define NULL 0
-
-
 #if __GNUC__ == 2 && __GNUC_MINOR__ < 96
 #define __builtin_expect(x, expected_value) (x)
 #endif
diff --git a/extras/mini-os/include/types.h b/extras/mini-os/include/types.h
index 8c3a6b385e..8194fba3c0 100644
--- a/extras/mini-os/include/types.h
+++ b/extras/mini-os/include/types.h
@@ -34,8 +34,6 @@ typedef signed long         s64;
 typedef unsigned long       u64;
 #endif
 
-typedef unsigned int        size_t;
-
 /* FreeBSD compat types */
 typedef unsigned char       u_char;
 typedef unsigned int        u_int;